Load local git name/email for cargo init

Fixes #3920

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 5b4f4faaede9b779adbb072081cbbb5f4189c1e8..1e92aa5c785673688ea3dd41b189726d6c8ce766 100644 (file)
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -6,6 +6,7 @@ use std::collections::BTreeMap;
 use rustc_serialize::{Decodable, Decoder};
 
 use git2::Config as GitConfig;
+use git2::Repository as GitRepository;
 
 use term::color::BLACK;
 
@@ -514,7 +515,12 @@ fn get_environment_variable(variables: &[&str] ) -> Option<String>{
 }
 
 fn discover_author() -> CargoResult<(String, Option<String>)> {
-    let git_config = GitConfig::open_default().ok();
+    let cwd = env::current_dir()?;
+    let git_config = if let Ok(repo) = GitRepository::discover(&cwd) {
+        repo.config().ok()
+    } else {
+        GitConfig::open_default().ok()
+    };
     let git_config = git_config.as_ref();
     let name_variables = ["CARGO_NAME", "GIT_AUTHOR_NAME", "GIT_COMMITTER_NAME",
                          "USER", "USERNAME", "NAME"];